Now respects disabled modules