Fix Bugs;