Add back the register fix