fixed server codes