Hack in place which fixes slow jump, still have a hang though