Revive module bugfix for #43