Attempt to fix content negotiation bug...