Workaround Bug 1032307