Made compatible with QBit 0.5x