Fixing redundant module structure