Add fix around the already loaded modules