BFQ patch v3r1 #2