Merge issue fix attempt