Fixed compatibility with ADT 17