missing self
Merge pull request #587 from ndawe/master

missing self