[FIX] bug

Merged Agustín Maio requested to merge fix_bug into 8.0-stage

Merge request reports