#CRX-6 fixed