WIP connection-fix.