Fixed issue with possibly persistent queue files