Started implementing fix for failure to detect content type.