Fixed wrong class search