Fixed issue with spaces inside commands being replaced with {SPACE}