I would gladly try to fix this issue myself and submit a PR – I just need confirmation of the intended behaviour.