Agree, this is better fixed as follow up or files as an issue