Make jumping more robust