Fix for #94

I put a lot of the details in the issue, so check that out. #94