Yeah, there’s some issues with the current handling of this (see the other open issues).
I’ve redoing this layer of tickets in 1.6.0 but it’s pretty substantial so it’s not something that can be done with a few lines. I’m hoping to open up 1.6.0 to some beta testing in the next week or so.