Bug Fix to CommandQueue