[FIX] Dupplicate
[FIX] Name was in double sometimes