Fixed handling of cw padding