fixed location
Merge branch 'bugfix_script_error'