Fixing selector stuff.