HOTFIX for APD-366