closes #1655