fix surround usage