Fixed for server crash