I think I'll address this as a separate issue if this is ok with you.