fixed module handling