Fix for ADT 22