Fixes 1364

closes #1364