fix flipped else
remove else for validation