Thanks for the feedback. A revised patch is attached.