fixes yosi + clali