closes #567.