* HotFixes for Validator class