Should address #22 as the validation was reversed