Fixing selection pipeline