fixed duplicated