Fix spotlight problem