Fixed init bug