Location Casing bugfix