patch based on volker's initial work in trunk that fixes the queu update problem...