Fix retry queue bug