Rename of variables and location crash fixed