Fix jumptable from merge issue