closes #1376