repeat fix + simple modmapping