removed filling with nulls cycle in rare situation