Apply hotfix due exec() issues