Replace uncorrect self to correct cls