Added data migrator fix