Fixes #455 (I think--will need some testing yet)