Analytics, fix #3