Continue to fix Bug#10085