Fix init issue