[v7r0] BUGFIX: closes #1685

There was still a bug there.