fix nonRepeaters handling