fix the bugs!
fix the bugs correctly!