I think this will fix #62...
A better (most likely) fix for #62