Fix issue with Module Detection