Post-merge fix