HOTFIX for APD-318