Fix issue 61

Hello Nick! 

I'm trying to gradually get more familiar with the codebase. This is the result of my fiddling and a weird attempt to resolve #61. It's a small patch and totally unacceptable solution, although seems to work in my case. Something to get started for sure...