already merged in this PR #727