Try to fix CSR error