closes #1318