Fix from merge.