Fix issues with extra padding