Bug fixing
Merge