Fix SRW/SRU NS for diagnostic