Fixed a bug with the cross list option