Fixing Figaro