Thanks for the feedback! Please find the revised patch attached.