fix initialization handling