bug in class & escape fix.