Fix for fatal server crash