seems to have fixed the jump-back bug