Fix init behavior
Merge branch 'tmp'