issue6291: some minor changes related to the previous commit