Fix merge mistake when rebasing for PR #1169