fix pvp issues related to location