Fix and the module switcher