Location Transfer bug fixing