Fixing class tree (hopefully)