Fix: Trimming issue

I had a trimming issue with the original code, this fix it.