Fresh init workaround