Added fixes made at Feedzai before 24/12/2013