Fix bug 1987

Merged garciadav requested to merge fix-bug-1987 into master

Merge request reports