bugfix: self/this