Fixes 848

closes #848