@cmarcelo you want this fixed before any merge?