Trying to work around server crash