issue6551: Some modifications after Simon's remarks