fix for figaro