Fix duplicating Bug