Fixed extra space bug