Added check for whitespace