Location Department fix