Fixed figaro implementation.