Thanks for the pointer. Let me work on the in a separate patch.