Bug 6195 - Deadlock solution by Matti