Fix server crash number 2