Fixing bugs again