closes #635