Work Queue Fix