Fix for null content_type in