Fix a case with suject and added a new validation