Fixing init issue