fixed overlapping problem