Small merge fix.