further changes according to comments in the previous pull request TRUNK--4314