Fixes #2, keeping the connection