jump fixed from merge