Fixing space issue