Fix for latest init setup.