bug fix, added  more to CommandQueue