Add a check for the leading and trailing spaces

Add a check for the leading and trailing spaces #723