Issue #1 - Fix class selector