Fixed whitespace escaping