Improved version number robustness