Wenbo Chen
Fix bugs