Also here.  (Tho also happy to have this fixed in a separate commit if you prefer, since it's a separate issue.)