closes #1237