fixed avatartoggle retention bug