Fix 833

I think this may fix #833?