Fixes #20 for real this time...

Thought I did fix #20 in last PR, but turns out I actually didn't...

Anyhow, I think the diff explains how this works pretty easily.