feat: apply #326