Content-type preservation fixed elsewhere