Fixing code
Merge