Fixes the regression of extra space before variable