Update: Fix bug problems