Tried to fix a crash on client