Fixed classes again