Fixed: migrate bugs