Be more discriminating in version string matches