Fixes (hopefully) #13.

Can't write test for this issue yet. Just commit change, submit
test later.