fixed an issue with validation