closes #1654