Fixed duplication issue