fix merge conflict with PR #1006