Fixing bugs again...