WorlkLocation bug fixed