Improve fix version method