Fig bugs again
Fix bugs