Fix surround

It was messing up with my remapping