Use better version comparing code