Fixed modules duplication