Fixing selector types