ADF 12.1.2 fix