fixed mistake from merge