ADA compatibility fix