Fixed scripting