Trying to fix crash on server restart