Fix to support cases where module has an identity explicitly specified.