fixing typo from merge