@gtgt Thanks for creating this pull request 👍

The description you provided doesn't really say much about the reason for your suggested changes, can you go a bit more into detail on why you want to change this?

Additionally, this pull request doesn't touch any of the tests, but I think we need some adjustments or some additional tests in order to confirm that your change works as expected. The test suite is currently failing and needs some adjustments as I described in #90 and #88, so in order to get the checks in here green, we'll first have to take a look at updating our test suite.