Remove space issue