Merge issue, fixed