more debugging, avoid over iteration
(#420)