restoring function missing after merge