Workaround Bug 1078009