yeah, but it is unrelated to the topic of this PR, so it should be a separate PR which can be merged separately (and faster). Mixing a bugfix and a new feature for which you request the thoughts of the maintainers is a bad idea. It means that the bugfix has to wait until the end of the discussion about the feature to be merged (and it has a good chance to never get merged in case the feature is rejected because everybody will have forgotten that a bugfix was hidden in the middle of the PR for the feature)