Fixing issue
Merge