Fixes 1367

closes #1367