Work around docker issue 6345