Issues/21

Argh. I has made derp. Here's a fix.