Revert "Revert "Correctly add double quote to the space strippers""

This reverts commit cd9d90f2b2e385f3afa6e29ac6540a06b1b8ee55
Merge "Revert "Revert "Correctly add double quote to the space strippers""" into jb42