As mentioned in the other review, there's a real chance that we won't update the modifier state if this function isn't called. Consider doing it earlier so that it can't be blocked.