Added NLJ's Sweep2Wake fix