Fix problem on current server