Hotfix for executeCommand caused by merging