fixed server crashes!