Fixed server compatibility