Queue Fix