should fix relocation issues