Fixed references to self in closure