Fixed #96 server crash