Fixes Analytics