Fix no space issue