fix types in 8.6.11 and 8.6.12, close #391