Fixed version handling