Code merge fix