fixed duplicating