Fixed 17374 and 17237.