Fixed duplicate moduels problem