Fixes 1348

closes #1348