Fix merge issue with master.