no longer crashes on the server