Fix for Offer mode migration (final)