Fix double accounting of padding