Update: Fix bug