diff --git a/agents/agentreq_test.go b/agents/agentreq_test.go
index 71d9e7d56..d07d68476 100644
--- a/agents/agentreq_test.go
+++ b/agents/agentreq_test.go
@@ -30,10 +30,10 @@ import (
 	"github.com/cgrates/cgrates/config"
 	"github.com/cgrates/cgrates/engine"
 	"github.com/cgrates/cgrates/utils"
-	"github.com/cgrates/go-diameter/diam"
-	"github.com/cgrates/go-diameter/diam/avp"
-	"github.com/cgrates/go-diameter/diam/datatype"
 	"github.com/cgrates/radigo"
+	"github.com/fiorix/go-diameter/diam"
+	"github.com/fiorix/go-diameter/diam/avp"
+	"github.com/fiorix/go-diameter/diam/datatype"
 )
 
 func TestAgReqAsNavigableMap(t *testing.T) {
diff --git a/agents/diam_it_test.go b/agents/diam_it_test.go
index dd1ab88f1..ed27fa788 100644
--- a/agents/diam_it_test.go
+++ b/agents/diam_it_test.go
@@ -30,10 +30,10 @@ import (
 	"github.com/cgrates/cgrates/config"
 	"github.com/cgrates/cgrates/engine"
 	"github.com/cgrates/cgrates/utils"
-	"github.com/cgrates/go-diameter/diam"
-	"github.com/cgrates/go-diameter/diam/avp"
-	"github.com/cgrates/go-diameter/diam/datatype"
-	"github.com/cgrates/go-diameter/diam/dict"
+	"github.com/fiorix/go-diameter/diam"
+	"github.com/fiorix/go-diameter/diam/avp"
+	"github.com/fiorix/go-diameter/diam/datatype"
+	"github.com/fiorix/go-diameter/diam/dict"
 )
 
 var (
diff --git a/agents/diamagent.go b/agents/diamagent.go
index e6ecaa015..4ac7fe770 100644
--- a/agents/diamagent.go
+++ b/agents/diamagent.go
@@ -29,10 +29,10 @@ import (
 	"github.com/cgrates/cgrates/engine"
 	"github.com/cgrates/cgrates/sessions"
 	"github.com/cgrates/cgrates/utils"
-	"github.com/cgrates/go-diameter/diam"
-	"github.com/cgrates/go-diameter/diam/datatype"
-	"github.com/cgrates/go-diameter/diam/sm"
 	"github.com/cgrates/rpcclient"
+	"github.com/fiorix/go-diameter/diam"
+	"github.com/fiorix/go-diameter/diam/datatype"
+	"github.com/fiorix/go-diameter/diam/sm"
 )
 
 func NewDiameterAgent(cgrCfg *config.CGRConfig, filterS *engine.FilterS,
diff --git a/agents/diamclient.go b/agents/diamclient.go
index 16cff01fe..5d2f8d4bd 100644
--- a/agents/diamclient.go
+++ b/agents/diamclient.go
@@ -26,10 +26,10 @@ import (
 	"time"
 
 	"github.com/cgrates/cgrates/utils"
-	"github.com/cgrates/go-diameter/diam"
-	"github.com/cgrates/go-diameter/diam/avp"
-	"github.com/cgrates/go-diameter/diam/datatype"
-	"github.com/cgrates/go-diameter/diam/sm"
+	"github.com/fiorix/go-diameter/diam"
+	"github.com/fiorix/go-diameter/diam/avp"
+	"github.com/fiorix/go-diameter/diam/datatype"
+	"github.com/fiorix/go-diameter/diam/sm"
 )
 
 var dictOnce sync.Once
diff --git a/agents/libdiam.go b/agents/libdiam.go
index 2cd918f52..a71a1beab 100644
--- a/agents/libdiam.go
+++ b/agents/libdiam.go
@@ -31,10 +31,10 @@ import (
 	"github.com/cgrates/cgrates/config"
 	"github.com/cgrates/cgrates/engine"
 	"github.com/cgrates/cgrates/utils"
-	"github.com/cgrates/go-diameter/diam"
-	"github.com/cgrates/go-diameter/diam/avp"
-	"github.com/cgrates/go-diameter/diam/datatype"
-	"github.com/cgrates/go-diameter/diam/dict"
+	"github.com/fiorix/go-diameter/diam"
+	"github.com/fiorix/go-diameter/diam/avp"
+	"github.com/fiorix/go-diameter/diam/datatype"
+	"github.com/fiorix/go-diameter/diam/dict"
 )
 
 func loadDictionaries(dictsDir, componentId string) error {
@@ -462,7 +462,7 @@ func updateDiamMsgFromNavMap(m *diam.Message, navMp *config.NavigableMap, tmz st
 // diamAnswer builds up the answer to be sent back to the client
 func diamAnswer(m *diam.Message, resCode uint32, errFlag bool,
 	rply *config.NavigableMap, tmz string) (a *diam.Message, err error) {
-	a = newDiamAnswer(m, resCode)
+	a = m.Answer(resCode)
 	if errFlag {
 		a.Header.CommandFlags = diam.ErrorFlag
 	}
@@ -508,22 +508,6 @@ func disectDiamListen(addrs string) (ipAddrs []net.IP) {
 	return
 }
 
-// newDiamAnswer temporary until fiorix will fix the issue
-func newDiamAnswer(m *diam.Message, resCode uint32) *diam.Message {
-	nm := diam.NewMessage(
-		m.Header.CommandCode,
-		m.Header.CommandFlags&^diam.RequestFlag, // Reset the Request bit.
-		m.Header.ApplicationID,
-		m.Header.HopByHopID,
-		m.Header.EndToEndID,
-		m.Dictionary(),
-	)
-	if resCode != 0 {
-		nm.NewAVP(avp.ResultCode, avp.Mbit, 0, datatype.Unsigned32(resCode))
-	}
-	return nm
-}
-
 // diamMessageData is cached when data is needed (ie. )
 type diamMsgData struct {
 	c    diam.Conn
diff --git a/agents/libdiam_test.go b/agents/libdiam_test.go
index 8509011e7..f75bcb39a 100644
--- a/agents/libdiam_test.go
+++ b/agents/libdiam_test.go
@@ -26,9 +26,9 @@ import (
 
 	"github.com/cgrates/cgrates/config"
 	"github.com/cgrates/cgrates/utils"
-	"github.com/cgrates/go-diameter/diam"
-	"github.com/cgrates/go-diameter/diam/avp"
-	"github.com/cgrates/go-diameter/diam/datatype"
+	"github.com/fiorix/go-diameter/diam"
+	"github.com/fiorix/go-diameter/diam/avp"
+	"github.com/fiorix/go-diameter/diam/datatype"
 )
 
 func TestDPFieldAsInterface(t *testing.T) {
diff --git a/glide.lock b/glide.lock
index 539ed7b9c..59151e32a 100644
--- a/glide.lock
+++ b/glide.lock
@@ -61,8 +61,8 @@ imports:
   version: f996da7890eaec95ba13240253744446e17e6598
 - name: github.com/cgrates/fsock
   version: 317895b42f1af0a0d3a845701b4612473a438fcb
-- name: github.com/cgrates/go-diameter
-  version: 74cc2c72ff0c6ff7af51868c6e541b6d1b7c5514
+- name: github.com/fiorix/go-diameter
+  version: f4823472d0e034d116b1aad90c065a347798c4d8
   subpackages:
   - diam
   - diam/avp
diff --git a/glide.yaml b/glide.yaml
index 33d38f610..4b60ea54d 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -5,7 +5,7 @@ import:
 - package: github.com/cgrates/kamevapi
 - package: github.com/cgrates/osipsdagram
 - package: github.com/cgrates/rpcclient
-- package: github.com/cgrates/go-diameter
+- package: github.com/fiorix/go-diameter
   subpackages:
   - diam
   - diam/avp