Fixed multiple version issue