This closes #1713