Put it here: Fix bugs

Fix bugs