End of the fix of error

For discussion see fff0778d25f26031b9639e8d996e67ec68d722a1