fixed duplicated items issue