fix when unit is newly created