try to fix new endless loop