Use a better version handler.