Attempt to support servers variability