Fixed extra padding issue