Merge pull request #1835 from birarda/master

fix for toyball crash