Made SOS hlint compliant