Migration fix