Multiple register issue fixed