fixed some issues caused by the change in location