Possible fix for server crash