Fixed enable / disable of module and contexts