closes #631