initialization fixed in some cases