Changes on improving the rule on version check