Strip whitespace here as well