closes #1476