Fixed scripting compat