We should , but this is something that needs fixing library-wide. A bit out of scope of this PR.