Fixed minor bug from Merge Conflicts.