Fixed missing check
Merge branch 'fix_connection_loop' into dev_new