Fix SW spotlight