UTs fail was fixed