See #697