Fix jumping issues