Fix for merge issue