closes #1558