fix for null iteration