Fix nasty bug that would come up only if a client connection to a remote