APPS-2436 bug