infinite loop introduced with the new edit code -- Fixed