Fix to return validation