Fix select-type regression