this one I think we should change. I don't like the hack to break the loop.