Attempt #2: Fixing Bfq