Fix for Offer mode migration