fixing bugs for follow