Fix module handling.