Spotlight issue #379