Fix 4

Merged payno requested to merge fix_4 into master

Merge request reports