fix loading of modules
Re-fix infinite loop matching.