fixed module definitions