fixed module stuff