Ihor,

Please find attached the amended patch. All things considered, I think
this is the best option to fix the issue that has arisen.

Leo