fixed module looping