Fix the Trim issue