Change to correct some odd error with using self as a var