Fix for merge.