Fix for Problem NW spotted with classification moves.