Fixes #70

I tried to fix the issue following jmesserly's advice.