Fix a bug
Fix bugs again