Use correct moduleId