-- Fixed another issue with SNR. Should be the last time (hopefully)