Fixed variables duplication