fixing messed up context
Setting command list on the prototype.