Another merge fix.