Repairing the problems raised in some comments