Second attempt at fixing check-man