改错，兼容avalon