Fix for validations