This closes #564