Fixed connection proxy to allow for "done" triggers