Fix Registers structure