Fix for #370

I think this does it.