Fix: head-trimming fix