This closes #1173