Oops, fix details and comments of last patch.