fixed module mapping