Fixes connection dropped. Take 2