Fixes recursion and providing the correct module data.