Better match SW mode with HW one
Merge pull request #1061 from raven02/patch-12

Better match SW mode with HW one