Post merge fix