BF: fix bug in creating command list