diff --git a/agent_based/huawei_bgp_peer.py b/agent_based/huawei_bgp_peer.py
index 7c326d26f2e66a2d39531ccf92bc036c7e2d3c52..8ac7273b45df8d97ea1fcb4e5a7d77686e064891 100644
--- a/agent_based/huawei_bgp_peer.py
+++ b/agent_based/huawei_bgp_peer.py
@@ -14,6 +14,8 @@
 # 2020-07-20: added BGP prefix counter
 # 2022-04-30: code cleanup/streamlining
 # 2022-05-09: added item to BgpPeer class, this is used in the discovery function
+# 2022-05-11: changed bgp_get_peer_entry to get proper parameters instead of Nontransparent list
+#             added remote_as to BgpPeerItem
 #
 
 # snmpwalk sample
@@ -128,20 +130,20 @@ def parse_huawei_bgp_peer(string_table: List[StringTable]) -> Dict[str, BgpPeer]
 
     peer_table = {}
     for entry in hwbgpPeer2Entry:
-        oid_end, remote_address, state, fsm_established_counter, fsm_established_time, unavail_reason = entry
-
-        bgp_peer = bgp_get_peer_entry([
-            remote_address,
-            state,
-            '2',   # admin_state set to not admin_down
-            None,  # in_updates
-            None,  # out_updates
-            None,  # in_messages
-            None,  # out_messages
-            fsm_established_counter,
-            fsm_established_time,
-            None,  # in_update_elapsed_time
-            ]
+        oid_end, remote_as, remote_address, state, fsm_established_counter, fsm_established_time, unavail_reason = entry
+
+        bgp_peer = bgp_get_peer_entry(
+            remote_addr=remote_address,
+            remote_as=remote_as,
+            peer_state=state,
+            admin_state='2',   # admin_state set to not admin_down
+            in_updates=None,  # in_updates
+            out_updates=None,  # out_updates
+            in_messages=None,  # in_messages
+            out_messages=None,  # out_messages
+            fsm_established_transitions=fsm_established_counter,
+            fsm_established_time=fsm_established_time,
+            in_update_elapsed_time=None,  # in_update_elapsed_time
         )
         if bgp_peer:
             afi, safi = oid_end.split('.')[1:3]
@@ -187,7 +189,7 @@ register.snmp_section(
             oids=[
                 OIDEnd(),  # 0.afi.safi.adresstype.length.RemotePeerIP
                 # '1',  # hwBgpPeerNegotiatedVersion
-                # '2',  # hwBgpPeerRemoteAs
+                '2',  # hwBgpPeerRemoteAs
                 '4',  # hwBgpPeerRemoteAddr
                 '5',  # hwBgpPeerState
                 '6',  # hwBgpPeerFsmEstablishedCounter
diff --git a/huawei_bgp_peer.mkp b/huawei_bgp_peer.mkp
index 673170459cdda874a40da899f407ced65f412f66..84e8dfefacea368438b79d8c9a38c9b1c70d7c72 100644
Binary files a/huawei_bgp_peer.mkp and b/huawei_bgp_peer.mkp differ
diff --git a/packages/huawei_bgp_peer b/packages/huawei_bgp_peer
index 30947ac4a316d9cdf65c8111e134cdc7fa93585d..ffb9558285aef386ccac9f1ee658072bab67bc86 100644
--- a/packages/huawei_bgp_peer
+++ b/packages/huawei_bgp_peer
@@ -16,7 +16,7 @@
  'name': 'huawei_bgp_peer',
  'num_files': 2,
  'title': 'Huawei BGP Peer',
- 'version': '20220509.v.0.3',
+ 'version': '20220511.v.0.4',
  'version.min_required': '2.0.0',
  'version.packaged': '2021.09.20',
  'version.usable_until': None}
\ No newline at end of file