Fix with_connection