Added whitespace check