Fix module building's end