Fixed merge conflict for PR #1348