HOTFIX for APD-754