Small fix for parameters containing spaces