fix figaro issue