Changed validation behavior