Ide 1539

Should be AfterClass?