@madaug: I hope we resolve