Fix for merge error.