Fix #511 jump_list behavior