Merge with issue fix