Fix after more UT