Module loading system fix