Corrected a mistake from merge