Fix command list updating #21