Make sure methods are called in the context of the calling class

/to @ritch