fixes issue #10

Merged Santiago Said requested to merge 7.0-fix-iss10 into 7.0

Merge request reports