Fix the location problems