fixed issue with validation