Fixed bug in Validator