fix Server.expand issue