Fixes #154
Merge branch 'bsongis/TelemetryCorruption-154'