Three Six Nine: Fix bugs

Fix bugs