Spotlight issue #376