fixed serverside crashes (probably)