closes #1555