another figaro bug fix