Content Negotiation fix