Fix <type>3 padding issues