improved fetch queue protection