[Bug Fixed] No need to compute Ein again.
Merge branch 'release/v0.99.2.1'