Better hanlding of system identifyer.