Fixing server crash