Fix a bug; List mode is still not working