closes #1217