closes #1352