Fix recursive duplication