HOTFIX for APD-491