Fix location scope