Fix trimming - sort of