[BUG #7249] minor refactoring