fix missed self. removal