Fix class finder bug