resolve migration issue