Hi Ivy. The patch looks good to me. But I think it would be very nice to have a test for it, which would be broken at first and fixed by this patch. Can you add it please? Regards, Dmitry