Fixing class resolution