fixed reconnections issues, removed unneeded evade check