diff --git a/content/negotiator.go b/content/negotiator.go
index 8bacc65..f4c3493 100644
--- a/content/negotiator.go
+++ b/content/negotiator.go
@@ -138,7 +138,7 @@ func NegotiateContentType(r *http.Request, offers []string, defaultOffer string)
 
 func negotiateContentType(accepts []AcceptRange, offers []AcceptRange, defaultOffer AcceptRange) string {
 	best := defaultOffer.RawString()
-	bestWeight := float64(0)
+	bestWeight := defaultOffer.Weight
 	bestParams := 0
 
 	for _, offer := range offers {
@@ -155,10 +155,10 @@ func negotiateContentType(accepts []AcceptRange, offers []AcceptRange, defaultOf
 
 			if bestWeight > (accept.Weight + booster) {
 				continue // we already have something better..
-			} else if accept.Type == "*" && accept.Subtype == "*" {
+			} else if accept.Type == "*" && accept.Subtype == "*" && ((accept.Weight + booster) > bestWeight) {
 				best = offer.RawString()
 				bestWeight = accept.Weight + booster
-			} else if accept.Subtype == "*" && offer.Type == accept.Type {
+			} else if accept.Subtype == "*" && offer.Type == accept.Type && ((accept.Weight + booster) > bestWeight) {
 				best = offer.RawString()
 				bestWeight = accept.Weight + booster
 			} else if accept.Type == offer.Type && accept.Subtype == offer.Subtype {
diff --git a/content/negotiator_test.go b/content/negotiator_test.go
index 7f72f3c..2e15e36 100644
--- a/content/negotiator_test.go
+++ b/content/negotiator_test.go
@@ -40,6 +40,25 @@ func TestContentNegotiation3(t *testing.T) {
 	assert.Equal(t, "application/xml", format)
 }
 
+func TestContentNegotiation4(t *testing.T) {
+	header := http.Header{}
+	header.Set("Accept", "*/*")
+	req := &http.Request{Header: header}
+
+	offers := []string{"application/json", "application/xml"}
+	format := NegotiateContentType(req, offers, "application/json")
+	assert.Equal(t, "application/json", format)
+}
+
+func TestContentNegotiation5(t *testing.T) {
+	header := http.Header{}
+	header.Set("Accept", "*/*")
+	req := &http.Request{Header: header}
+
+	offers := []string{"application/json", "application/xml", "application/json;v=1", "application/json;v=2"}
+	format := NegotiateContentType(req, offers, "text/html")
+	assert.Equal(t, "text/html", format)
+}
 func TestAccept(t *testing.T) {
 	header := http.Header{}
 	header.Set("Accept", "application/json;  q=1 ; v=1,")