Fix jumping issue