Merge fix from upstream.