small improvement of the class searching.