Fixed string trim issue