Fix for merge