closes #1321