Fix when there is no padding at all..