Altered some modules to be sure, they do not generate problems