Change take clipping algo

Fixes #2754 by basing the take clipping on the nominal amount instead of the actual amount.