Final fix merge.