prepare to take PR #198