performance fixes
replace this calls in _itr