Fix module builder