Added fix for replacement for selected modules