Fixed register issue