minor bugfix: don't repeat some init steps