HOTFIX: Fixed bug APD-381 about refactoring.