before merge
Fix bugs