Fixes 1124

closes #1124