Improved bytes proxied tracking #488