After the last changes, I think we need to re-check it. I closed the previous PR and let's keep it do be done in the future.