Fix bug 16635 - CheckSystemVersion is a bit nicer