Fix offset spaghettis