fixed calls to init