Small Post-Merge fix