Fixes #151
That'll teach me to do blind quickfixes :-/