Ensure we only trim on save