Fixes #109

FIxes #109.
My bad for removing the fix.
Do these 5 lines need to be caught?