Fixed Merge Conflict for PR #1153