[SHELL32] -The only change I did in the previous patch was buggy.