Correction bugs
Merge