Fix: Trimming issue