Fixed erroneous invocation of "self" when "cls" was appropriate