Fixed jump-back issue