made it more whitespace robust