workaround for APPS-259 uncommented