Bugfix on class searching.
Version 3.5.5