Fixed space issue