Escape more spaces!