improve followed bug workaround