Fixing the Validator Hook to work correctly