closes #679