closes #626