Reference queue fix