Fix selection mixin