MYLOC-55 - Prevent spy from leaking