Fix call chain
Merge pull request #1892 from GawainLynch/hotfix/scripthandler

Fix call chain