Just adapt to the final version of SH measurement