FIX: wrong syntax
Merge pull request #1573 from ubeda/v6r9_BUGFIXES_p10

[v6r9] BUGFIX: wrong syntax
v6r9p11
Conflicts resolved after merging with rel-v6r9
v6r9p11