Fix public spotter