Removed trim() call as explained in TODO #106