Done. Removed this check, and instead added it to class search pattern itself.