Fixed Init bug