[FIX] bug fix

Merged Matias requested to merge FIX into 12.0

Merge request reports