closes #1505