Recent research studies in the over-provisioned networks have shown that the Assured Forwarding (AF) service in the current Differentiated Services (Diffserv) architecture fails to provide bandwidth assurance in some situations. This paper focus on the situation where adaptive and non-adaptive traffic coexist in the same real queue at routers and the buffer management scheme treats the traffic of the same priority in the same AF class indiscriminately. An enhanced RIO is introduced, which can, without excessively penalizing non-adaptive flows, (1) significantly improve bandwidth assurance of adaptive AF flows; (2) alleviate the starvation imposed on adaptive best-effort flows. These goals are achieved by doing the followings when the failure of bandwidth assurance is detected, (1) mapping adaptive OUT traffic and non-adaptive OUT traffic to different virtual queues;(2) adapting the queue length thresholds according to whether the bandwidth assurance is achieved. We validate our design through simulations.