Fix bugs
Merge
Merge