bugfix: expirations need to be unset to prevent unnecessary recalculation.