fixes PVP issues
fixes issues with PVP