HOTFIX: Fix bug for APD-642