Removed problematic class selection
Tweak