[FIX] Fix bug

Merged Jose Luis Zanotti requested to merge fix into 12.0-stage

Merge request reports