Fixed the padding problem