Fix multiple players issue