handle whitespace better