Quick merge fix