bug850572: minor fix after some refactoring