Quite possibly, but yeah don't want to conflate changes. We can open a new issue for that.