Feature/fix duplicate characters