closes #1295