Fixed repeat-bug