fixed #1036, added missed validations