Fixed multi version suport