Fixed in 2.22.2, but a patch would work too.
i don't see the point of patching an old version when a new one already exists and is in the tree