BUGFIX: closes #1685
Merge pull request #1687 from graciani/master

[v7r0] BUGFIX: closes #1685