Proper fix for modules lazyloader