More delicate version matching