Fix #832

I think this should work.