Fix/workaround fro ADT 23