This closes #781