Fixed class init