Fixed init issue