Fix module according to @wchen-r7 feedback