Fixed issue with duplicate-Class query.

557u/13i