Fix the old value trimming.