v2.8.6; fix the two bugs