[Bug 591832] repair