Validation is now working properly