fix multiple surface entry to base duplicated