Safety commit
Fixed connection behavior