Revert "Revert "Fix Entropy early depleating""

This reverts commit 78a931c03d89f92ac93778876965b83586567efd.

Not it's fault. Still wlod.
Misc.