diff --git a/VERSION b/VERSION
index 1545d96..c1aee2f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.5.0
+3.5.1-dev
diff --git a/internal/pkg/core/olt_platform.go b/internal/pkg/core/olt_platform.go
index 9526ee7..232af80 100644
--- a/internal/pkg/core/olt_platform.go
+++ b/internal/pkg/core/olt_platform.go
@@ -115,7 +115,7 @@
 	// minPonIntfPortNum stores the minimum pon port number
 	minPonIntfPortNum = ponIntfMarkerValue << ponIntfMarkerPos
 	// maxPonIntfPortNum stores the maximum pon port number
-	maxPonIntfPortNum = (ponIntfMarkerValue << ponIntfMarkerPos) | (2 ^ bitsForPONID - 1)
+	maxPonIntfPortNum = (ponIntfMarkerValue << ponIntfMarkerPos) | (1 << bitsForPONID)
 )
 
 //MinUpstreamPortID value