fix surround