As a follow up of #1449
As a follow up of #1449