fixing bootstrap for Yotam