fix class resolution