more snd logic fixing