Your fix (and the other suggestions here) all seem reasonable to me.

This is a known problem, by the way, so it's already been fixed in the development branches.
--
Mike