Fixed extra spaces bug