Fixes 1117

closes #1117