Fix bugs
Fix stupid bug