Fixed mising variables (self.)