Fixing issue with validation errors