Make an issue for this or a PR. Optimization is not the goal of this PR.