Fixed a bug where two s1 surfaces could still be mapped to the same s2 surface.