closes #627