Fix list mode