Fix issue #320

I'd like to make sure that even small things don't slip into master before being reviewed.