fixed server classes