trying to fix duplicated