Fixed Figaro Issue