Unofficial bug fix on Multiplayer