closes #1235