Bug fix

Merged Jose Luis Zanotti requested to merge BugFix into 7.0

Merge request reports