Fix select

Merged Egor Bitochkin requested to merge fix_select into main