Merge issue fix.