closes #1172