But surely it would be great if could be handled properly at some point in the future by SDK internals