FIX: Fixed function of add a suffix in case of collition

Now it properly adds 1 to each number of repetition.