Bugfix + Analytics