Fixed persistence of enabled modules by context