Fixed context migration