Fixed empty field validation