fixing class references