Fix changes introduced by !4

Closed Amir MOHAMMADI requested to merge patch-1 into master

Merge request reports