Fixed bug with list option