Some server side correction