Fixed validation logic?