HOTFIX for scripts