You're willing / able to investigate that? Would be nice if we can do that before merging this work.