Fixes #179 multiple handyman crash.
Merge pull request #187 from duncanspumpkin/fix_179

Fix #179