Merge fix from other branch.