closes #697