APPS-11 fix