closes #1369