closes #1590