Fixed potential relocation issues.