Analytics partial fix