Fix ScriptHandler