Multiplayer fix (16/21)

Multiplayer fix