fix duplicating issue