Fixed no space issue