Thanks for this fix. Looks good! Unfortunately I just merged the earlier PR.