I can submit a follow up patch next weekend if no one does it before then.