Fixing set list option