Hotfix to address IPv6 padding issue