fixing bugs with auto follow