[SHELL32] Follow up of #2021 (#2022)