Fixed list-dict issue