fixes issue #10

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

Merge request reports