[Hazi] Small modification