Possible solution for the p2r jumping. Should be tested.