1.9.3 compatibility
Trim whitespace
Trim whitespace