Fixed migrate to lists to work in normal situation