Fixed jump condition bugs