Re #1651 Trimming on update