Attempted fix of thunder crash
Fix #169
Merge pull request #189 from duncanspumpkin/fix_thunder

Fix thunder