This closes #1144