Fixed init of objects