temp fix for server crash