Fixed bug; original module set instead of wrapped one