Fixed an issue with validation