Fix to system ID check.