Switched to self.S

Adhereing to the Foundation best practice