closes #1576