Fix for overly aggressive input validation