Stop class corrected