A little bit of fixing for multiplayer