Fix bug with custom validations