We will try to see what we can do at the code level. This is definitely something that needs to be fixed.
I have open a GitHub issue to remember, and will try to address it at some point (I was in the US for work this week, and had no time to be close to the chain).