closes #1374