Fix for server crash