Better match SW mode with HW one