Fix initiation that could lead to errors.