Last merge fix