Fixing incorrect work with validations - Thank you @edg3r