work on #697