HOTFIX for APD-802 and APD-803