Possible fix on double-queueing.