One more fix to merge issue