Fix #616

Why do you check this condition twice?